projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e652840
)
src/macterm.c (XTset_vertical_scroll_bar): Fix merge mistake
author
Miles Bader
<miles@gnu.org>
Tue, 29 Jan 2008 05:12:00 +0000
(
05:12
+0000)
committer
Miles Bader
<miles@gnu.org>
Tue, 29 Jan 2008 05:12:00 +0000
(
05:12
+0000)
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1020
src/ChangeLog
patch
|
blob
|
history
src/macterm.c
patch
|
blob
|
history
diff --git
a/src/ChangeLog
b/src/ChangeLog
index 92cd97146f726a053f3bdfa36ab7467149a12c76..0645765cddee3c176d7de5ad0824651fc852c4f7 100644
(file)
--- a/
src/ChangeLog
+++ b/
src/ChangeLog
@@
-1,3
+1,7
@@
+2008-01-29 Miles Bader <miles@gnu.org>
+
+ * macterm.c (XTset_vertical_scroll_bar): Fix merge mistake.
+
2008-01-28 Jason Rumney <jasonr@gnu.org>
* w32.c (stat): Don't double check for networked drive.
diff --git
a/src/macterm.c
b/src/macterm.c
index 58de15cace0d14cf7e38c521dc50135634f007e3..7ffcbf55e9a2ed303abe74d32433d821483ab8a2 100644
(file)
--- a/
src/macterm.c
+++ b/
src/macterm.c
@@
-5300,7
+5300,7
@@
XTset_vertical_scroll_bar (w, portion, whole, position)
#if USE_CG_DRAWING
mac_prepare_for_quickdraw (f);
#endif
- Draw1Control (SCROLL_BAR_CONTROL_
HANDLE
(bar));
+ Draw1Control (SCROLL_BAR_CONTROL_
REF
(bar));
}
}
else